Ooops. Fix the build so that mingw build overrides the INHIBIT_USB

from the parent.   Improve error when build w/o USB.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 5e277184912077ce08487541af9fe925941356c5..1151f80c8d19e9d66aeef7334be374efd16bd2c5 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -88,8 +88,8 @@ dep:
        (echo -n "internal_styles.c: mkstyle.sh " ; echo style/*.style ; /bin/echo -e '\t./mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)' ) >> /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_2_4_beta10132004
-VERSIOND=1.2.4_beta10132004
+VERSIONU=1_2_4_beta10162004
+VERSIOND=1.2.4_beta10162004
 #VERSIONU=1_2_3
 #VERSIOND=1.2.3
 

diff --git a/gpsbabel/jeeps/gpsusbstub.c b/gpsbabel/jeeps/gpsusbstub.c
index b23cacd012ccdabbb773242ddd081da04765fb00..04659c3eeeecfc3c2882ba6e17635d746d4fcb00 100644 (file)
--- a/gpsbabel/jeeps/gpsusbstub.c
+++ b/gpsbabel/jeeps/gpsusbstub.c
@@ -23,28 +23,29 @@
 
 #include "garminusb.h"
 
+const char no_usb[] = "USB suport is not available in this build.\n";
 int
 gusb_cmd_send(const garmin_usb_packet *obuf, size_t sz)
 {
-       fatal("USB support is not available");
+       fatal(no_usb);
 }
 
 int
 gusb_cmd_get(garmin_usb_packet *ibuf, size_t sz)
 {
-       abort();
+       fatal(no_usb);
 }
 
 int
 gusb_open(const char *portname)
 {
-       abort();
+       fatal(no_usb);
 }
 
 int
 gusb_init()
 {
-       abort();
+       fatal(no_usb);
 }
 
 int 

diff --git a/gpsbabel/mingw/Makefile b/gpsbabel/mingw/Makefile
index 9f5f8e518488e7dd21e637f404354df54408f784..f5833cb7d0ce72d0a5c97ae5b3442023dc33f0e8 100644 (file)
--- a/gpsbabel/mingw/Makefile
+++ b/gpsbabel/mingw/Makefile
@@ -7,7 +7,11 @@ gpsbabel.exe:  wintesto.cmd
 
 include ../Makefile
 CFLAGS=-Iinclude -I../coldsync -O $(INHIBIT_USB)
-# INHIBIT_USB=-DNO_USB
+#
+# Must define empty (don't comment out the whole line) if you want to 
+# override INHIBIT_USB from the parent Makefile.
+#
+INHIBIT_USB=#-DNO_USB
 OSJEEPS=jeeps/gpsusbwin.o
 
 gpsbabel.exe: $(OBJS)